Merge "Fix lint error."
am: dde8b86949

* commit 'dde8b8694954c0268eb12a7ccbddf07d9de262fd':
  Fix lint error.