add support for extra CM packages

Change-Id: Ia0d564ae23d5f054bb2470998dec6b39a1e119e2