Merge "Format battery java test code" into main