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: 8f53070436
am: 4105447204 -s ours
Change-Id: Ic0032332e8601221d575482f2226463c309971db
This commit is contained in: