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

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