Merge "Fix pairing issue in PairingConsent API."