am 685439bb: (-s ours) am 218f48d6: Merge "bundle init.rc contents with its service"

* commit '685439bbc7ef958a3472465ebdabf2b997889e76':