f5d5b6f00f
This reverts commit 5dd46d51ed.
Reason for revert: Temporary revert until ag/4040557 goes in
Change-Id: Iab2c747a99e1fb1cc5a91787dbf185df77f791b4