* commit '8e63bbfd00ee27fcdbb04cfc0cf96ccdb2c50cc5': Fix issue #22989030: Separate battery whitelists