Merge "Optimize code that only uses PageMap call." am: 1e7b753c36 am: bdcd4f8e85
am: 7a7b844499

Change-Id: Ia88d5a89f1934ed2666bdd5e080a436a644002f8