Merge "Fix lint issue." am: b138a6ee7f
am: 81e73e9d4c

* commit '81e73e9d4c6bf4190891acca48f54fbbaf5ef6a3':
  Fix lint issue.