Merge "Update subtext for Security settings." into oc-dev
am: a0e617f96d

Change-Id: I4ca0f307c5fdedb46ffd98bc85d5774c3ef74238