Merge "Separate system_version and product_version." am: b7b92040c2 am: 17c7b6045a
am: 7efd883330

Change-Id: I69ec2cc2e601db942b830f56c8c33851c0337916