This reverts commit 085c87d5. Reason for revert: b/174768641 Change-Id: I131de046ed23512ca63bd13ad41e453e6c720144