This reverts commit 9e832416. Reason for revert: b/277810794 Change-Id: I1506e6ceba9b238716006eff0be481ccf2399555