am 6a35b981: Merge "Fix lint error."

* commit '6a35b9815e436d63ceb5c6d0c82c053c038ded91':
  Fix lint error.