am 21bc66d0: am c31ffe76: am 2994462d: Merge "Fix NPE in ContactSaveService" into lmp-mr1-dev

* commit '21bc66d0fd294931167a1347d30f3f54b49f125a':
  Fix NPE in ContactSaveService