This reverts commit 511a000f. Reason for revert: b/148087431 Bug: 148087431 Change-Id: Icc63c119fbaea413982dc5d9c358a298b7fbd128