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

Change-Id: I5d163be24053eba0592dddf637fdd89373c8fa15