am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev

* commit '6ad79259540e9e73c3d4664b03c103a560433db0':
  Update javadoc on DPM.setGlobalSetting