m7_common: syncing with cm