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

Change-Id: I98cdd34dc4bae479ba51eaf5d6f34bbef8dec622