Merge "fix a typo" am: ab80ee4d52 am: 82b0a0ddf1
am: 8dfeebb3ac

Change-Id: I6ff484c09fa8f1350b7723af0917cc5c2f00b6a0