Merge "[AWARE]: Add support to accept either passphrase or pmk"