DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306
am: bdb0c8fc17 -s ours
Change-Id: I2d00e5bd394e93e8b2ac218056f30225580f681b
This commit is contained in:
b18bd06e94 am: 9434773306
am: bdb0c8fc17 -s ours
Change-Id: I2d00e5bd394e93e8b2ac218056f30225580f681b