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

* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports