Do not create unnecessary server directories

Change-Id: Ife6a2c6f206cba600f94398aee2e099f492f5372
2 files changed