This reverts commit 17cf02f3. Reason for revert: b/141448042 Change-Id: Iaa950638f5d433e431bffdebb3b1a4a6c7336bdb