Merge "Do not cache battery stats iterator and make it safer"