Merge "Fix typo" am: dec467f271
am: 7f114540d8

Change-Id: Iaa6bceebdab147a9e332c2db511aac9242474e3a