Merge pull request #16936 from aleksander0m/aleksander/mm-wwan-subsystem