[automerger skipped] Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into oc-mr1-dev
am: 79c2376045 -s ours
am skip reason: change_id I3fbc952bd44291ac22728c626b128fc0c1aae232 with SHA1 b122ae9660 is in history

Change-Id: Ia3a1efaabd913847653c2540028bac671a2bec1d