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

Change-Id: I8b779c85df3864115f5894c0cdd597c790417386