This reverts commit 87ff51db. Reason for revert: build breakage b/178327796 Change-Id: I51c56938540794097eda579ebe47fa5c0a4d8c12