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

Change-Id: I2cd3e75750a5c5459867852c7be632c3c01fd3f8