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

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