This reverts commit 01aa146c. Reason for revert: b/269175395 Change-Id: Ic15aec87e90f8a6e87ca8e6ab72ab13d4d780069