Merge "Extend T110 check for lib's service clients"