Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8
am: 2848738526  -s ours

Change-Id: I7c56e83a5de15ec7d3432e3ca4ec385499069f40