This reverts commit b230325c. Reason for revert: b/38117654 Change-Id: I00df422e4c040d6dc8723b187c0b5bd7116e168d