This reverts commit 553c027b. Reason for revert: b/197550396 Change-Id: I3c59d132985a3d21a11b55ba1546ed9f46f6e474