Dont kill other manufacturers

Change-Id: Ib27558102a8a1603781c8a8376f99b1080967c21