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

* commit 'a0918440803bcfa1d28472d70dd0e37ca79814fb':
  Fix USB mode development setting