Merge "Start Neko job service after reboot (if needed)" into nyc-mr1-dev am: 6ee69994fd
am: cbb440fbb1

Change-Id: Ia6bdcb59975c5719be4161426ae82b5d47342c80