Merge "remove "wipe battery stats" function prototype" into jellybean