This reverts commit ab65a507. Reason for revert: Revert for testing breakage b/264228834 Change-Id: I23533cf44fe4afbb2c152e35279443a9858886e9