am ec71fed0: Merge "Improve ABI handling for shared user ids."

* commit 'ec71fed089965c4d731eaa90344849a1775f937a':
  Improve ABI handling for shared user ids.