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

Change-Id: I7a7ec3965bc19f1f62428ea0737b6263d079dd02