am ef259e7b: am 58f816ca: am ff05ae30: Merge "Remove orphaned Calls as part of doUpdate()." into klp-dev

* commit 'ef259e7b05d35a0aad5e5c99624b61889a2fe863':
  Remove orphaned Calls as part of doUpdate().