Merge "Update DPM.lockNow() flag name." into oc-dev