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

Change-Id: Id42bb590b657ab4e3ae5164f51dcc50abb62a544