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

Change-Id: Id883b03aeac36542b5c258d757c6c7d152a303c9