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

* commit '461febadc44190bf19e870a0bc1a706ec3667212':
  Handle backup transport registration dynamically