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

Change-Id: Ida3d2b96cdd892180dc5a37d6b00a70bb0bc0507