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

* commit '64a8032f44da51d0422cb52af4631c7ae2545731':
  Fix bad USB configuration under Developer Options