Merge "Put product_id and product_version to OEM partition." am: dbcd26053b am: 1dfe33e52a
am: a8e4161eed

Change-Id: Ic1b757e3bf371cbffcfb3b993493e935e832faf9