am 6b3ec82b: Merge "bundle init.rc contents with its service"

* commit '6b3ec82b222f8ec0d50a43c0c9800efffd14ecb4':
  bundle init.rc contents with its service