comment out CM overlays

Change-Id: I95e10547a3b6310abdc3bfb1fbaa5dc61ea2df19