This reverts commit 4b6a7c3940. Reason for revert: b/299695302, b/299694769 Change-Id: I89c6719d23446f2f9ce24e5b75d321538b580431
4b6a7c3940