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

Change-Id: I67c0afd97cc4dc1b0d05405395c1b96d1045d5a7