Merge "Triggering quiescent reboot during OTA" into oc-dev