Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev