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

Change-Id: I84f79736947e39addfa1b1f0b865e2bb523fb87d