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: d96c17f7df
am: 94f51c99e3 -s ours
Change-Id: I86275f86f21bdac6c4c3e17fb910a793eab50e21
This commit is contained in: