Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3 am: 1eb2ded281 am: d4adaada55
am: 8258a2f0c3 -s ours
Change-Id: Ife51baf92c64bfe2f88db8da1698f67008a508b4
This commit is contained in: