Revert submission

Reason for revert: b/146032426

Change-Id: I1c94d3e16359edd26a093ece19ef7840336970d8
6 files changed