Merge pull request #22427 from Linaro1985/update_mm_1.22.0