am c5f34bd4: am 48c45d0e: Merge "Fix join scenario with provision discovery"

* commit 'c5f34bd40bc68925c6e99da02e179227d8eb3ae4':
  Fix join scenario with provision discovery