Merge "Update the battery broadcast receiver." into pi-dev