Merge "Enable use of error prone annotations" into main