Merge "Refactor stable uris back up container class" into tm-mainline-prod