Merge change 7567

* changes:
  Send all battery broadcasts with REGISTERED_ONLY_BEFORE_BOOT