Merge "Upgrade String16 users to C++17"