am 606f26c7: am 124b5aae: Fix lint warnings.

* commit '606f26c78bb59ec3132106ded5f85e62cc036402':
  Fix lint warnings.