Merge "Instruct user to enable Location Service for p2p" into oc-dev
am: 15c76c9c37

Change-Id: I0439db6a90225224c063a06cccc2b88575eaa671