Merge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f am: 5a05398da8
am: e3ee58a4e7

Change-Id: I86680b7dc7285658d5b71a8e8bc5fbf504522b96