[automerger skipped] DO NOT MERGE Ensure package names read from config are system packages. am: 6a56247200 am: c40e971e98 -s ours
am skip reason: subject contains skip directive

Change-Id: I7fb150cb6a263598b762d94545eb0e62843d9b7f