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

Change-Id: I89eac0d0d76baaebf5a43c2486321bbf666e0805