Merge "Set correct storage path for SDK sandbox" into tm-dev