Merge "Fix linter / errorprone issues"