Merge "init: allow '.' and '@' in service names" am: d879e0c750
am: 8ef815de68

Change-Id: If3fb4300b6964f1603830a7f75221e9b7aec9623