Allow -page arg to be handled by pagegenerators

Change-Id: I61f786509afb4c352762c8ebd1cffd34b67a5cfe
Merge "Allow -page arg to be handled by pagegenerators"