Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
am: 6d3573e530

Change-Id: I501ff6230b9b5fa5d7232e52cfe326320c7edf65