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

Change-Id: If124536a8842bd207647782a91b3d79817bf1076