am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev

* commit '22010817b90f97756a76777fcd1dbe7e3b63e808':
  Handle backup transport registration dynamically