Merge 'ib-jz47xx-battery-prereq' into psy-next