Merge "Fix spelling typos"
am: 1b44711662

Change-Id: Ie4d4ec9a07157f9be2841a870bc1c139758ddabe