Merge "Instruct user to enable Location Service for p2p" into oc-dev