Merge "Fixes two data races in USAP pool management." into qt-dev
am: 5e468cf4dd

Change-Id: I08c601277f24cf918000eb032e7d95f38e6c0c5c