Merge "Added a note about location permission" into mnc-dev