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

Change-Id: Ia3d158eb681c12c7c6cf21eb475835d36664afee