Merge "Address feedback from API council for INITIAL_URI."