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

Change-Id: I4f9e3d59707dda9ded73ffd46a477838b4855cec