Merge "Do not check flavor.id after Microversion 2.46"