Merge "Add missing mapping between JCA and keystore HMAC names."