am 38d3b133: Merge "Fix lint error."

* commit '38d3b133dcb5968a69ffbcda58990fcdca5b56a1':
  Fix lint error.