Merge "DPM and DPMS changes to support DO on AAOS"