Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3 am: 1e9b978dc7 am: 4a11140df3
am: e7e70b868d -s ours
Change-Id: Idb866bd10846d9f7e454087569e6f976222846a5
This commit is contained in: