This reverts commit 7667643ef6. Reason for revert: b/345139412 Change-Id: Iebea39e034faeab53d972c691477e2d710787a14
7667643ef6