Revert "Partially revert ag/27263995"

This reverts commit 20b076f11caf86e9d080222f489e812d897b7083.

Reason for revert: b/339801674 is fixed

Change-Id: I63445f6d4fe9dc693e547df2ecd4026f5f72363b
2 files changed