This reverts commit ee58838a. Reason for revert: b/141624112 Change-Id: I637aa68dd57d235ff4f5b723022543c668cd666e