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

Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897