Merge "Harden framework against backup transport crashes" into nyc-mr1-dev