This reverts commit 375e2765. Reason for revert: Breaks the build Bug: 139833475 Change-Id: I21c2c25152a91b71007f766502c19043ec17a836