Align ro.product with stock

Change-Id: Ib97fdd1902ed78b0f320347b7411756e18b8f895