Merge "Docs: Fix typo 'UIR' should be 'URI'" into oreo-dev