This reverts commit 248cb1e9. Reason for revert: b/239254093 Change-Id: Idf1b33b10b5861e74e8bd6c594871658839cf894