Merge "Do not set brandOverride if opNames are invalid"