Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-dev