Merge "Optimize code that only uses PageMap call."