* commit 'f0e5501e093c688cd293308e0aafc2b55326c255': Fix issue #22989030: Separate battery whitelists