Merge "Print correct version code when skipping outdated system packages" into pi-dev am: bf22d134cc
am: 8c943d0784

Change-Id: Ib4a3866ea97b28e616dd1f4ceba6186cc6ce3ec3