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

Change-Id: Iddd8c89020fb56e62a41fc3ce63aca8c90beab9c