Revert submission

Reason for revert: b/146402634

Change-Id: I8d8c1aad36263078dca6f1760a880b092d1e64bd
2 files changed