Merge "Remove usages of CdbCompat class alises"