Revert "Cherry-pick the relevant parts of master change"

This reverts commit dd16d44fe8fb9c1191999ed0d772c9ebb4e75632.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
1 file changed