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

Change-Id: Idf3bf3c6baea706a15df5e68c50d79723a100d9f