Merge "Only query for estimate on battery level change" into pi-dev am: 729bfdf9a8
am: 953cfa401d

Change-Id: I1ec5976be4407cd7a605691758d00dea4f1c5422