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

Change-Id: I7938942514e34a1af4844f2ad6444033e261b00e