Merge "Fix NPE in ContactSaveService" into lmp-mr1-dev