Cherry pick generic brand name fix
Cherry pick generic brand name fix

digidem/iD,openstreetmap/iD,openstreetmap/iD,openstreetmap/iD,kartta-labs/iD,kartta-labs/iD,morray/iD,morray/iD,digidem/iD,kartta-labs/iD