Merge "Add keyset support for ECDSA public keys." into mnc-dev