am d5074bef: am f032eef6: am df20623c: am 13a8c8c7: am 5b8f013a: Merge "Fix NPE in deleted contact removal" into klp-dev

* commit 'd5074bef78b0ae682690b04b2afefea142d9eb8f':
  Fix NPE in deleted contact removal