Merge "Disable USAP by default on devices" into qt-dev
am: 6c3bbf9e93

Change-Id: I131b75b45e43b185266ebb54f49815896fc67ffe