Previously only those batteries which had both thresholds available were returned. BUG: 464535 (cherry picked from commit d4fff074) (cherry picked from commit 9cc6650a)