Merge "Revert submission" am: 85fe6364a7 am: c1b2832012
am: 4c69382aec

Change-Id: Idb3bc22a6f4a32b374c647a7c6c0decb4bd86e4d