Merge "Fix NPE when exempting CDM apps from  auto revoke" into rvc-dev