Merge "bootstat: battery test fails on QC devices"