Merge "Fix Error Prone errors"