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

* commit '2c20c79dffbe37b40a520af88deb21804bdd4408':