Merge "Separate system_version and product_version."