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

* commit '10b02df820ece261b621a1f46838995249a1082c':
  bundle init.rc contents with its service