am 06b90c91: am 2c20c79d: (-s ours) am 1cb10b83: Merge "Fix NPE for VVM Sync sms messages." into mnc-dev

* commit '06b90c91cbc0c2508090a598da8fe5b6af63e9f7':