This reverts commit 17045d95. Reason for revert: Broken build: b/185947883 Change-Id: Ia7e6af3b47540142b5ea511e825a9dc86c0680c6