Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
am: 677d5a5e01
am: 4ffd4f09e7
Change-Id: Ie5f0581cad536a08d557aa29c455a2fce8ab34e0
This commit is contained in: