DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6 am: 2e3a277175 am: 758dede2d8
am: c3b2907486 -s ours
Change-Id: I482e11435602d2d655219e259bedd7a8b27d822b
This commit is contained in: