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

Change-Id: I4a8e28e4e929eaf3c308cd851ef4d12f24e6b817