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

Change-Id: I3a096672ca35073fd8d982942a44e4852649ea71