Complete fix for workspace clean-up

Closes-Bug: 1403188

Change-Id: I879e826dee725355c89ea1f7a00220cddd2dfe00