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

* commit '48c45d0e3bcacebfc3635bc893875146b7ecb787':
  Fix join scenario with provision discovery