Merge \"Thread-safe pipe teardown during restore operations\" into nyc-mr1-dev
am: 4595bc7f12

Change-Id: I8c53961f93633f26615970c40d071f2e8d714780