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

Change-Id: If83f16847ddded66ed3d462ffb45016187bcae7f