Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: fad8cec592
am: a22bf1cd8b

Change-Id: Iaadee52c55098da5941dab5edfa1087dac7822c3