Merge "exec makeparallel" am: cf8afef2eb am: 46c08db556
am: 74e1ccf614

Change-Id: I3fc58de48d785c5d222003ef4f4a12307a149efc