Merge "tombstoned: fixed tombstones failed issue" into pie-gsi