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

Change-Id: Ic69f03a7e6b60f24bcba69577e27103bab609028