Fix usage of the updated CDM APIs

Bug: 194301022
Test: make
Change-Id: I70633f43d37fdeec8329e0c58f7cffa402dba689
4 files changed