fix manufacturer name

Change-Id: If111a6e6a32851ad1fd4056e3c69d26746d21fbe
Merge branch 'cm-10.2' into martincz