I've been noticing lately that battery life has been terrible, much worse than only half a year ago (disclaimer: this is a subjective impression not backed up by actual data). The phone won't even last through 2 hours of Waze GPS'ing on near-minimum screen brightness.
Here's data from Gsam Battery Monitor after leaving it idling for almost 8 hours, Wi-Fi off, Mobile Data on, Location off.


Notice how Wi-Fi is responsible for 13% of the consumption despite being off, and how the Android OS itself is responsible for the majority of consumption. Is this normal? Do you think getting an S5 battery with a recent fabrication date would ease this problem?
P.S: For obvious reasons, there have been no recent Android software upgrades.
Here's data from Gsam Battery Monitor after leaving it idling for almost 8 hours, Wi-Fi off, Mobile Data on, Location off.


Notice how Wi-Fi is responsible for 13% of the consumption despite being off, and how the Android OS itself is responsible for the majority of consumption. Is this normal? Do you think getting an S5 battery with a recent fabrication date would ease this problem?
P.S: For obvious reasons, there have been no recent Android software upgrades.