Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev am: 2aa255a746 am: ccbe8239ae
am: e2d54d719c
Change-Id: I52c29b8797b24da797518ba36439e71f969152fb
This commit is contained in: