am c698b78a: Merge "Fix lint error."

* commit 'c698b78a17043d8898deb817098181595fbe734e':
  Fix lint error.