5 Years Ago
merge from battery_drain_fix 49847