am b2a59010: Merge "Fix lint errors."

* commit 'b2a59010b787bd9d5d9bf36d32682faa5ad8da24':
  Fix lint errors.