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

Change-Id: I1b162f02dad89e781662ad3a1e9b3f5d654760d0