This reverts commit 2a58ddb89f. Reason for revert: b/266987957 Change-Id: I4a4a1f01a693d703f4dc87e8169fbf374729d274
2a58ddb89f