Merge "Enabled the USAP Pool by default." into qt-dev
am: 5d6c852211

Change-Id: If0c01e4fc2887ea1cc3771961c80d672aed723e6