Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev