am 2654105b: am ca96a322: Merge "Update group capability before connect" into jb-dev

* commit '2654105b15d8da5ad4fd84eef7e2c3f662373283':
  Update group capability before connect