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

* commit '20a0da89089984b12805b707c8644bb4413389c4':
  Fix bad USB configuration under Developer Options