so basically wait till the next update but till then my battery is ****?

You can try the recommended solutions if you see that your accu is draining by AndroidOS.
But they are only temporally.
Sometimes Restart help, if not, clear Google play services CACHE, shut down and remove accu for short time.

You can try the recommended solutions if you see that your accu is draining by AndroidOS.
But they are only temporally.
Sometimes Restart help, if not, clear Google play services CACHE, shut down and remove accu for short time.

XDA Developers was founded by developers, for developers. It is now a valuable resource for people who want to make the most of their mobile devices, from customizing the look and feel to adding new functionality.Are you a developer?