Merge "Make servicestests debuggable"