Merge "Fix USB mode development setting" into mnc-dev