Merge "bootstat: battery test fails on QC devices" am: 834e89c25a am: 808d1d4f80
am: 0ce7bc4332

Change-Id: Id03f6c713003cfbf28f6e936fba2a87ce82e9232