Merge "Removing workaround for battery defender"