Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c am: 76ce0386db am: 626d56f2bf
am: 7d7e1be366 -s ours
Change-Id: I30e3b7ab8205c57512d5ff1c45d83424b7a6dd42
This commit is contained in: