am 9abb6302: am f7ddd009: Merge "bundle init.rc contents with its service"

* commit '9abb6302e30ed276cf36904bbf09697ccc065a1f':
  bundle init.rc contents with its service