Merge "Return different disconnect reason and error strings for oem and carrier satellite" into 24D1-dev