Merge "Update KeyStore tests to account for software digesting." into mnc-dev