Merge "fix a typo"
am: ab80ee4d52

Change-Id: I9717c3cdfc845f2150e1286386d8ec54bd8ea4a1