pollux :  use retail name rather than product code for PRODUCT_MODEL.

Change-Id: I2532c92c3a098dcf2e9e90f70f8536ad48584f4b
Merge remote-tracking branch 'cm/cm-11.0' into HEAD