Merge "Fix SIP enterprise lookup" into mnc-dev