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

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