Battery Fix Vol 2

Change-Id: I891da479022dda92ceb2e8fcc19ace53010efb61