am 0e5e728a: Merge "Fix build lint issue."

* commit '0e5e728a4a4f042f157e1897cc8bbc2b0bb110b1':
  Fix build lint issue.