[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: a699f1f5 am: 9ba15259 -s ours
am skip reason: subject contains skip directive

Change-Id: Idba223f16a563fbd18d3bc436bf49a4ccd59af5d