Change some PRODUCT variables

Change-Id: Ie20fd8fcb74e72701581209a43b219bf1bb05dd7