Revert "Align ro.product with stock"

This reverts commit d620c4d3d176a57a3f5666563a75af595e638e7a.

Change-Id: Iaf83b40e0da642a064e575a25790eb059c4f3ca4