This reverts commit 3e63df53. Reason for revert: b/149425896 Bug: b/149425896 Change-Id: I9fe31509c040cc421ccb00ea60f15e6f199e8bc6