[automerger skipped] Merge "DO NOT MERGE Ensure package names read from config are system packages." into pi-dev am: d48077745e -s ours am: 27e5817c14

Change-Id: I4cff2df117f81f570d35706f062402874dcb9178