am 0531f204: Fix \'restore STA reconnection behavior\' cherry-pick

* commit '0531f20404b2e284d1b444d5af48b6e0c629975b':
  Fix 'restore STA reconnection behavior' cherry-pick