Merge "Fix errorprone warnings that should be errors"