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

Change-Id: Ib6064fff33f31905c9f2a0b3dc46ac87f29edcf1