Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b am: 6529292783
am: 579dd3b014  -s ours

Change-Id: I521a26e52905983a855217aa8e3d0f9b68fe2d44