Merge "Use assert_flavor_equal to check flavor before and after microversion 2.46"