Merge "Fix lint error."
am: f50d7ea29e

* commit 'f50d7ea29eda80fd405de7f665ea15eafde3dff5':
  Fix lint error.