Revert submission

Reason for revert: Broke a test: b/145140538

Change-Id: I906db285836b2681e1f29bd7b5c8f8b46077cbde
1 file changed