Ashish: this was one of my comments on the last version of this patch. Please pick just one event for battery changes and stick with it.