Update use of Page interface for 7fa1aa7364a9f89669a457fd098a0cc51954529d

Change-Id: Ic8a43122d4d0ac76cc65fd7832bdbb4ce90dc287