Merge "Protect against null detail record." into mnc-dev