Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: af86efd70d
am: 70ed66ce6c  -s ours

Change-Id: Ib02e9c3b13fb600d3a6e36091e36762d9de511a6