Adding option of not deleting the old cat, It was partially implemented already

Bug: 55291
Change-Id: I76b512acb692598a6a9528a162085e5ee330ffb8