Merge "Use minimum 20 bytes salt for RSA PSS." into mnc-dev