BatteryTile reconciliation

Change-Id: Ia3f97fc5d4594fa871030f3914df9bab5063ccb8