Merge "base: Fix the problems for runtime overlay."