Merge "Make Error Prone warnings in sync with Error Prone documenation."
am: 86c3b72d9c

* commit '86c3b72d9c9cb46acd7b8339dc3ce0a2f869fb2f':
  Make Error Prone warnings in sync with Error Prone documenation.

Change-Id: I78b111feb108096a9b38c798dd4ee666a6852797