Merge "Make minor tweaks to RunCommandTargetPreparer"