Revert^2 "Partially revert ag/27263995"

This reverts commit 44f00e6ec66542a706b92af7f740e6f8a29e8c27.

Reason for revert: b/368877710

Change-Id: If8f84d1a93baec0b33271a9ab830f70bc875c248
2 files changed