Merge "init: account for "init.svc." prefix in IsValidName" am: 8cf0bd75f7 am: 6b03c273b1
am: 68a9f5a14f

Change-Id: Ia56ffdfc942ab4bb07a3b0856804fff3ccbc73b0