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

Change-Id: I1ac672c4104b50bfe433547c8e99956c26b41b16