am c5d5dd86: am c698b78a: Merge "Fix lint error."

* commit 'c5d5dd86ab40c021a5a1b00c35bb106d8ef9c1df':
  Fix lint error.