Merge "Clean up use of pipe"
am: a33b765ca0

Change-Id: Icb2e0ab5e86e00b0d975549e6cf851b84d7d99eb