Merge "Clean up use of pipe" am: a33b765ca0
am: 1ca8af7bad

Change-Id: I24f4e15728a0b9127753d544b8df5d3aecd8a9f5