Merge "[CPS] Update NCMP-DMI chart" into istanbul