Revert submission

Reason for revert: Broke a test: b/145140538

Change-Id: If4f76b6f4900bc5ddc0d372e0f0840bec0c7353f
1 file changed