Merge "Remove iwlan mac config" into sc-dev