cm extra packages

Change-Id: Ic5cd9449c9051c039b3bcd6f2a280ca50a026738