If the record status changes during the removal process, the current implementation will fail. Closes-Bug: 2015762 Change-Id: Iebe609e5f365d03e99f2a4580671175b4642763c