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

Change-Id: Icc803d1648ac0c4b4341291fa41ed02d2b04f54a