This reverts commit 98b76cc2ec. Reason for revert: <INSERT REASONING HERE> b/190622577 Change-Id: Ief39f82875e6fa885829aea62eed00f2f2e6774e
98b76cc2ec