Merge "Merge "Don\'t assert on uris with stack." into nyc-dev am: 760b557158 am: 5371f04cac" into nyc-mr1-dev-plus-aosp
am: a015abdf32
* commit 'a015abdf32d6bb284254e52a0a6ac2774f21687c':
Change-Id: Ic7f938c5597dc632ed16af447cc659316361fbc2
This commit is contained in: