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

Change-Id: Idfd3bb1f56023a5a8e061b93554f3e855c09584b