Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev