DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730
am: c0cc8695a5
Change-Id: Ia0e1987122659a913145fc86a6626e0dd1890f24
This commit is contained in: