Merge "Explicitly close pipe end when we cease operations... am: 3bed1c0ef8 am: a0a6924749" into nyc-mr1-dev-plus-aosp