Merge "Don't append userIds for the current user's clipData uris." into nyc-mr1-dev