Merge "Fix lint error"
am: af5b2a28ab

* commit 'af5b2a28ab0b35276fe6e527820ecccc350843bb':
  Fix lint error