[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

Change-Id: Ibb139bacff271607a8f53bf0c0771666013be488