revert some CM branches to cm-10.1