Move CDP common MLO ops under MLO Macro Change-Id: Icd1f13856091c973d213d0d90aabfe86bd588cdd CRs-Fixed: 3590973