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

Change-Id: Iebcdf8ff79316c718a461445eba8169c68d00e1b