Fix a typo and a case

Change-Id: I8d5f8266a3a26d6e6fe2362c9d8ccf43dee381c2
Merge "Fix a typo and a case" into kk