Merge "Propagate signals through makeparallel" am: e0f42b41f6 am: 6f4807da4b am: fd00ed23a9
am: c66ad83f43

Change-Id: I24c78ce29f32dc10574b55003b5be031bcb950ed