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

Change-Id: I6f29450d3431e23073a5c7b0fa6f9a63095fe335