DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours
am: cdb996355e
Change-Id: I5129414295d369564a603da928f19ee6b74d2d9f
This commit is contained in: