am 081d2781: Merge "Fix lint error and typo."

* commit '081d27817608c2ea035f2473c4ea1062a79bccef':
  Fix lint error and typo.