am a864e46b: am 20a0da89: am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev

* commit 'a864e46b47ea20694ce9366295d997a1debffa02':
  Fix bad USB configuration under Developer Options