Merge "Revert submission" am: d7b9321580 am: c41d9e25f3 am: c17e332031

Change-Id: I6612ffc2436c0e3d735c39037dfac2ba0ba7592d