Revert submission

Reason for revert: b/140119552 has been fixed. The change no longer needed.

Change-Id: I66c4744d8d72992bf01042a5043bd3dcfbbbe005
3 files changed