Paginator() takes 5 params now

Bug1317295

Change-Id: I6d755d62bdbf30768a16ffe17d819c7c23efd577