Merge "Fail if we're unable to agree on an ISA for shared UIDs."