am 2e0cf19d: Merge "Fix lint issues."

* commit '2e0cf19db386cbe003550027faf8c53739cf08db':
  Fix lint issues.