Merge "Fix errorprone issues - part 2"