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

* commit '2994462deb5138ddc8f104a53e81b854f1bd323d':
  Fix NPE in ContactSaveService