Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev