Fix DPM unit tests, also fix a log message. am: 6ad5f92512
am: 2f78ab5387

Change-Id: Id42c0cda2542eb5cc2325d8c6747e8bbe7d3a1ef