msm_fb updates from CAF