Merge "Revert submission" am: c099ce8af1 am: 051ce149cf

Change-Id: Ia53ce019e430aa69b8c05b12a2636e56783a67d7