This reverts commit 76e6f9d2. Reason for revert: b/196030595 Bug: 196030595 Change-Id: Idf42eee3277ceace275aad3e11c7ee692f1171a6