This reverts commit 4dae2857. Reason for revert: b/130513450 Fix: 130513450 Change-Id: Ie2f7c5e66f1436c0a540fb86b1886978d72cb7c7