Improved zero subdomain detection

In some cases X-Subdomain might not be set. Improves that.

Change-Id: I2700ac2d2cefd8f52c6843dc3c0afc1fd4089499
Merge "Improved zero subdomain detection"