Report combined system version and product version.
am: 983f5780ca

Change-Id: Ib8c0847d2163804c22d1d0bf605e2184fa06c22e