Merge "Updated security settings string." into qt-r1-dev
am: b7ac44e643

Change-Id: Ib890b97401801fb5bcea20d1cd4fa284c1dec09f