Typo fix

Change-Id: Id5bb7297adbc38909aa184b6d6a222aa719f90be
Merge "Typo fix" into release-4-6