Merge "Add aconfig flag for URI changes." into main