DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b
am: 9285808f9d
Change-Id: Ifde04e3733d5aa69968a21a1af7dbc4b0094797d
This commit is contained in: