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

Change-Id: I4fe568d6b43e5a5c06aee6339f6fe4618865c2c6