Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881 am: 0501c50040
am: 08e9d52817

Change-Id: I9e2cae82179316a6768fa43a7f313c32470fd40a