Merge "Emergency SUPL when location is disabled" into oc-dev