Merge "Fix build breakage in pagination API Demo."