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

Change-Id: I1fcd341b2e7f21c8f9f507fdd718ebf328a7367b