Factor out the manufacturer name (and the device name as well) Change-Id: I24354b0a631dc3756077fc5dc1c400cb66ae0e3c