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

Change-Id: I0dca98d50cb5a1f835be0c9cd960d8ed15f16e7a