IBR to PSLF Question

I have been in repayment under IBR starting in 2016 for eligible loans and was moved to SAVE when that rolled out. I now have applied for PSLF and was put on the RAP program. I have worked for a government agency the last 3 years. Do the previous IBR payments since 2016 count towards PSLF or only the payments made during the three years working for government agencies?