[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 am: 0c2e80e1 am: 506836e0 -s ours
am skip reason: subject contains skip directive

Change-Id: I7edc977b3f2e76dc53578101a7600327005affec