Merge "Fix create flavor error"