Merge "Revert submission" am: 790d3640f8
am: 3fc6992af7

Change-Id: I1282a3e0efe103d235c3d86b3d96e6e3f538fdaa