Merge \"Don\'t dispatch Uris with appended user handle\" into nyc-dev
am: 7ef9f61be6

Change-Id: I8cea3262da232ad0b3086cb55c54495d3c86db66