Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED."