Merge "Update DPM.reboot with new restriction" into nyc-dev