Merge "Fix errorprone build" into sc-dev