am 218f48d6: Merge "bundle init.rc contents with its service"

* commit '218f48d6c55a7ee5115a7a8fc4248d33ea01811f':
  bundle init.rc contents with its service