This reverts commit d2815c0b. Reason for revert: b/233820283 Change-Id: Ib3c9b79b4d76890d476b8f7ddb19b025f6042473