DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb
am: 61e9179646 -s ours
Change-Id: Ibfdb4128b1db25db478f9b4cb987d0754ddd9124
This commit is contained in: