Fix the problem due to removal of Focal

Fix the problem due to removal of Focal
Merge pull request #1 from tonyli1357/cm-10.2

Fix the problem due to removal of Focal