Merge "Revert submission"
am: 790d3640f8

Change-Id: I5ce4b142a75e661f061aeed566e0a5e653ffb698