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

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