Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18
am: ee37330dff

Change-Id: I9f75a9309a91de3a6145861189534c8ab10ca6f3