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

Change-Id: Id54dd7f09156f7be9f5c9cf82f53d3c1176084f7