Bringup: CM12 changes