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

Change-Id: I0d41b8bc48f715f259b584fceb2b5e1192c0eac3