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

Change-Id: Ibab2dbf14eb8aaa5426ec4ae66e1b0900428cecf