am fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev

* commit 'fa331b1dfbf3e071e2ff48dbe21727452bfb8042':
  Harden against transiently unavailable backup transports