Merge "Fix typo on designtool clm & bp-gen job"