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

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