DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 am: 190511955f
am: 8fa9048477 -s ours
Change-Id: Ia27d7b8170386df35a895c917d235bdd312827ca
This commit is contained in: