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

Change-Id: I32bf51ba5866c39209b584032c528c0b8cf6cfdc