Changing domain name regexp

Change-Id: If6c7a24891690b8906e4129f12b581fded91599a
Merge "Changing domain name regexp" into release-0.1