Merge "Fix spelling typos" am: 1b44711662 am: 1d80f85e4d
am: 823457200a

Change-Id: I1c0644748964938613cc22aeff7d483f1ca4cc21