Merge "Fix crash when mWrappedMessageData is null." into mnc-dev