Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into pi-dev
am: de5026c433

Change-Id: Ic8dc52e28097526916a8d770f344cce20491cd4a