am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'

* commit '54b22ca2488e4901265c99a42b5c5e0725a99199':
  init: Queue Triggers instead of Actions
  bundle init.rc contents with its service