Merge "Use sharedUserId as package name if there are collisions"