This reverts commit d2afe4bf. Reason for revert: b/267869885 Change-Id: Ia68d8a71a7278a4efb59ac9094dd4b9cfd5ba722