This reverts commit 3bfc9d47. Reason for revert: b/283303329 Change-Id: Id1bbff981b1ed4e535fb4382d1b0d710909ccc4c