This reverts commit 842e0653. Reason for revert: b/291722322 Change-Id: Ib036c73cd1cf175d96f07335b260ce3678762091