am f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'f35bd64130ceb668a8fee544ef3b888f51d3eb14':
  Fix USB mode development setting