support other domains

Change-Id: I81d1963faf8cd69f36bcddfa5936c255814c02f4
Merge "support other domains"