Merge "Update to net.ltgt.gradle:gradle-errorprone-plugin:0.0.10" into oc-dev