This reverts commit 9cbadee7. Reason for revert: b/171220278 Change-Id: Ib73285473168f1541a41564a6ef02f9ca18ac4c3