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

* commit 'b8b20a503255da8097d64a2f1554d118f8e3c424':
  Fix USB mode development setting