Merge "Set the default value for Secure Settings: AWARE_ENABLED" into qt-dev am: b962712dd9
am: 3350d71536

Change-Id: I9a946a202abb5c2489e1d682609f81bf2293ae71