am 1380c848: am 32592270: am 64e13880: Merge "bundle init.rc contents with its service"

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