Merge "Improve ABI handling for shared user ids."