Merge "Return error for wrong mb_type" into mnc-dev