yuga: : use retail name for PRODUCT_MODEL

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