* commit '0385e3e908fb9988bb2d2d0d15e32cb6a819b34e': Fix issue #22989030: Separate battery whitelists