Merge "Extend the time between WiFi energy samples" into mnc-dev