Merge "[pm] remove package name from codePath" into main