Minor typo corrections

Change-Id: I5361027a60804e1aa2f30086e7945da0cf7bdd61
Merge "Minor typo corrections"