Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2