Merge "fix(mmc): resolve the build error" into integration