Changed for collect on unreferenced to be interpreted depending on the
GCPeriod value

Change-Id: Ibcc2c4722cc1b1337cac05a801e6648324da4bb6