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

Change-Id: I7ea71a0659015d41d8744e2baab339926b98eecb