PRODUCT_DEVICE change

Change-Id: Iee4f28475d05fc19abac759fb4c9d5986f1ceedd