Merge "Fix the build failure in studiow."