Merge "battery: fix ordering of ICL/FCC configuration"