Fix overlapping pages (issue 12551580)

Change-Id: I03c29c36828b6c4baadb33b13b0e852b07b2d40f
(cherry picked from commit efb31e399d335351a8db3de54ed66fabd30606ba)
1 file changed