Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev