Unifying the workspace translation logic
am: a92e0dfa0c

Change-Id: I076e006f19a5831dfdca82e458f03f90444806cb