Merge "Don\'t assert on uris with stack." into nyc-dev
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c