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

Change-Id: I66d6ced19d14180caa3c8cb3ef921cb9e41ab191