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

Change-Id: I69b4ae6fbdb4baf56b331d8c0fcd0f11a73bbf54