Merge "Update text for security preference." into oc-dev