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

Change-Id: I808cfaf83a575470f50b50b5d17791144d6c291e