Merge "Revert submission" am: 3b98950a2c am: 3876ecd56c am: b0b89803fc

Change-Id: Ie0c7aecb44e29e5ced98a40637eb02eef12e51d7