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

* commit '64397749effa088dcea3799fc8440845c5a1c193':
  Handle backup transport registration dynamically