am b87c8131: Fix lint warnings.

* commit 'b87c813197ab205074e3bdbad4a5e7e2eb39e9d2':
  Fix lint warnings.