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

Change-Id: I1ecce2c6c319fa22a09472f110823798e3ffee9f