Merge "Fix NPE for VVM Sync sms messages." into mnc-dev