Merge "Explicitly set SetFlagsRule with NULL_DEFAULT" into main