Merge "Update product_id and product_version location." am: a57a2fd118
am: 4afbddcdf7

Change-Id: I9e9ce4046d7641df3e84d948ce9bc638f45bf8d8