Merge "Reaaply policies on reboot" into udc-dev