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

* commit 'c31ffe76629cdc724af829d8daf8e4fddd0e1aeb':
  Fix NPE in ContactSaveService