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

Change-Id: I9e32d1ed9c0f18b884818c37dd4eacf771030b6e