Merge "Remove service stub dep on default libs"