Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: 67dbaa8a14
am: 669d6694e1  -s ours

Change-Id: I29ab0714044a68b1faac50ae12398bf86bfd3a88