Merge "Add an app-ops check when registering for location" into pi-dev