Merge \"Harden framework against backup transport crashes\" into nyc-mr1-dev
am: 1165790f70

Change-Id: Icec9fab284cd476ffca3721d1d5f8eaaf1300ff8