This reverts commit 2eb8ad62. Reason for revert: Bug: 177011744 Change-Id: Ib9f1c0bda7d6df1b75dbe409f96dab39c1659781