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

Change-Id: I29362026527b9034ec0786313e69257581e983b7