Merge "Separate system_version and product_version."
am: b7b92040c2

Change-Id: Idd8433d4c4e4d35e44feb706d34ce2609c265c8d