Merge "Add secure settings to the test apps"
am: 1170b46a74

Change-Id: Id8357382f02ea469b2923eec79fc897417db21c0