Merge "[RESTRICT AUTOMERGE] Revert "Removed IWLAN legacy mode support""