Merge \\"Don\\'t append userIds for the current user\\'s clipData uris.\\" into nyc-mr1-dev am: e723ed8b51
am: 91b6f5e44f

Change-Id: I8e85d2e6df9768a48b5d3589304f60a23c9ab182