This reverts commit 716bd5ae. Reason for revert: b/244130109 Change-Id: Ieb3736c258f1e7c3b6106b2d8f13d2af0c5cabcb