Merge "Fix lint error." am: dde8b86949
am: b67e19ca71

* commit 'b67e19ca717b94d032fefd1e391c5f8f6384b6f8':
  Fix lint error.