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

* commit 'c3e8a1f3c1222ff4bef7c692dfe43ddadc8dee4a':
  Fix lint error and typo.