[automerger skipped] Merge "DO NOT MERGE Ensure package names read from config...

[automerger skipped] Merge "DO NOT MERGE Ensure package names read from config are system packages." into pi-dev am: d4807774 -s ours am: 27e5817c am: 79c052c5 -s ours am: b958df7d am: 85844efb

Change-Id: I59c4e7b82bd4f41420d8bd5bdfbaf991c69edaa5