TEMP: disable some unadded cm features for now

Change-Id: If63349f8ae41efd92d3408fc90d8b12bfe1cf9f0