Merge "[AWARE] Update docs for service discovery callbacks" into pi-dev am: b9147471ec
am: 1191a4c5da

Change-Id: If81d0074074058ab41944e097dad22f1651b9f7b