[automerger skipped] Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into pi-dev am: de5026c433
am: 9af5a323da -s ours
am skip reason: change_id I3fbc952bd44291ac22728c626b128fc0c1aae232 with SHA1 ea8d82c08a is in history

Change-Id: I97c4b7a1ca395d3ea66f2ff057a476233e0a9a0b