Merge "Move non-voting arm vpp device job to per-patch"