Merge "Revert submission" am: 5bceae6d35 am: 59c40be93d

Change-Id: I32bd41680e548a918e2a45e2f9cb4fdfae725f86