Merge "Update sandbox structure for apps with sharedUserIds."