Merge "Make Error Prone warnings in sync with Error Prone documenation."