Merge "[nss-clients] Fix compiler warnings"