Merge "Fix MismatchError error when checking flavor value"