add support for extra CM packages

Change-Id: I39c1d04bceb4c84eaccb32af6ccdb9419c1e2f06