am b9ac485a: am 49948146: Merge "bundle init.rc contents with its service"

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