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

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