Typo fixes

Change-Id: I934a3e04397fdd23b0772569a26b102025e3cc74
Merge "Typo fixes"