Merge "Fix batteryInfo unit test" into tm-qpr-dev