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

Change-Id: I77aded976737ef65baae630b1f00f7b6b0734082