This reverts commit 0d8ff25f. Reason for revert: Original CL caused b/35911519 Change-Id: Ice82b04dd00068d10f88c0d248bf95877e12cda3