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

Change-Id: I393cc158b2652801aabe3f9369bce73c2b09f6f4