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

Change-Id: I4f0e514d2f49156942c6818379347c369c79889b