[automerger skipped] Merge "DO NOT MERGE Ensure package names read from config are system packages." into pi-dev am: d48077745e -s ours am: 27e5817c14 am: 79c052c569 -s ours am: b958df7d90

Change-Id: I236ab8a14eb57c3f767f5e195713581734ae13c0