Merge "Format battery java code" into main