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: 7b2985bc9e
am: 85e0241626 -s ours
Change-Id: I4e830c48ff3f2b0a75cecb480e4dbd23c3359a69
This commit is contained in: