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

Change-Id: Id7d33f9fc01e30e62dd765ceedd929506a9cd5b5