Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev
am: 18fb24c5d3

Change-Id: Ic61398ebf0f4b453c2e859f49b373810934218bd