Revert ag/1707746

It broke git_master branch.

Bug: 33632105
Test: none, this is a revert
Change-Id: I0e63f58f2eedbdf0596fc5ffd3a91f2fde499a40
1 file changed