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

Change-Id: I5ae40c7077410ad34c3face4aa1fad62dfe5887c