Merge "Fix timeout in pap CSIT for auditing undeploys"