Removed 'UntaggedPageGenerator does not exist' warnings

Change-Id: Iac41aa4833aa6f204966aaa9e3e6d13f133093e8
Original-Change-Id: Ib7e8a545334d11b73e93a740b39690520ef209f6