cm-12.0-caf-new: Switch to -caf g2-common and revert to normal vendor