This reverts commit 0e766c11. Reason for revert: Breaking presubmit Bug: 153516672 Change-Id: I894b5d5ecff97c124b5e2bf7c7be28f23ee10367