This reverts commit 25728b15. Reason for revert: b/185085629 Change-Id: I2af49e3cb79af5bd80a0f69a2c09be5bbb45aeee