Add support for new CM 11S packages

Change-Id: I534f4dd71419c26cc631c054bfe0529e94bd59a4