Merge "Remove pairing_auth, pairing_connection from recovery."