Add back batteryView init post merge cleanup

Change-Id: I6ebe972d7a55ffd0f0b8ecd9be6772b1228cfc79