Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530
am: 5d65931af5  -s ours

Change-Id: I14933edb3f93eea4156698bb2669938849c30697