Merge "Add separate 'vndservice' binary." into oc-dev