am 124b5aae: Fix lint warnings.

* commit '124b5aae8ca65731b363d898e2da7a543e4b0e3e':
  Fix lint warnings.