am 26e08cb4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '26e08cb4a4ab9f9bc5446f4b831dec1828331cba':
  Fix 'restore STA reconnection behavior' cherry-pick
  Restore STA reconnection behavior