[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: 97144eb6 am: 0fb130e3 am: a9c059de

Change-Id: I66c3a95f57eed9b902d7a85b532e6f99c5541a95