Merge "Fix errorprone issues"