am e372dc2a: am 572acb85: am a6e5d614: am ec2a7951: am 1cb10b83: Merge "Fix NPE for VVM Sync sms messages." into mnc-dev

* commit 'e372dc2a82e64f565739c119de6023574f2b793b':
  Fix NPE for VVM Sync sms messages.