Merge "Fix Settings_SecureTest"