temporary disable cm related additions

Change-Id: If33788a9e8aeec36e66121e0fc414a835928a3af