Merge "Revert submission" am: 9eca80bd16 am: 28a74dca87 am: 403a67dae1

Change-Id: I52cf6575b916c948eab6756e948e4788e8d65375