Merge "Explicitly close pipe end when we cease operations... am: 3bed1c0e...
Merge "Explicitly close pipe end when we cease operations... am: 3bed1c0e am: a0a69247" into nyc-mr1-dev-plus-aosp
am: 820f2c9a
* commit '820f2c9a':
Change-Id: Ief5fd567e85005687f5abd87cefdeec426308fff