Add back clobbered cleanup

Change-Id: I418b612710850bbc3033c4bd0143fb0f0befd2cb
1 file changed