Merge "Fix device reboot when ranging empty params." into nyc-dev