fixed typos by champion

Change-Id: I4ce805facae95846d6c1fd16b8d7f8a6f7d30227
Merge "fixed typos by champion" into REL1_22