Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b
am: d4eff25f9f
Change-Id: I9676c155e718b25830980da5792b49e25c1ccecd
This commit is contained in: