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

Change-Id: I7dac81f71b873d77e4f11acbf727b149f9217fd5