Merge "Prevent duplicate signals from makeparallel"
am: 70aac88a61

Change-Id: Iade687bc2bfe56a357b0c8215b5f03cfdec2df9d