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

Change-Id: If084318f245412aa617aec2503308aa3b590eacb