Merge "Adding "quiescent" reboot mechanism to support STB operators"