Merge changes I18c5e4cb,I52769d83 into sc-dev

* changes:
  wifi: disable PMF-required for transition mode.
  wifi: finetune auto-upgrade behavior