Merge "Close cmd_pipe properly after updater test finishes" am: 64307daf5b
am: a11601da9b

Change-Id: If8f66fdf17f4878c067e7d7e5505ea00c1418fb2