Merge "Define SDK_SANDBOX_VIRTUAL_UID" into tm-dev