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

Change-Id: I6d613dd447b179e898eb3c2c74da6c01c0e9eaa9