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

Change-Id: I049f66856f9354432f722fd29248720d76e6c5e1