Merge changes I561c198c,Id4865f3c into jb-mr1-dev

* changes:
  improve sensor battery usage tracking
  track UID with connections