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

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

Change-Id: Icd93fd98666f35cc936ff80db2f717ae9cacdb32