Merge "Collect NeededUriGrants without holding locks." into qt-dev am: aac39e204d
am: eb366a5f25

Change-Id: Ie7ecf98d7eab6d7a8cac7ac38a12d5030c856679