Merge "Update strings for location services notification" into rvc-dev