Merge "[AWARE] Fix validity check on PMK + export PASSPHRASE lengths" into oc-dr1-dev
am: b243fb5ca3

Change-Id: Ib81d4e7757dda185311c3ba30155b5c5cc3594b0