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

Change-Id: Ib7a037e51b3a007a942fb877cb09d2c890021596