Merge "Fix DPMS unit tests." into tm-dev