Merge "Fix bad USB configuration under Developer Options" into mnc-dev