This reverts commit f2cb190a73. Reason for revert: This is the integration test CL, it will break due to ag/34545776 reverted. Change-Id: I5fc66fab409989479078dfcffea7793b9d6dd749
f2cb190a73