The new workaround doesn't work, reverting to the old one.
The new workaround doesn't work, reverting to the old one.

PiperOrigin-RevId: 190145488
GitOrigin-RevId: c7fa32c67bfd64cb0ab0d5aebe41ba31102cd4f4

google/tink,google/tink,google/tink,google/tink,google/tink,google/tink,google/tink,google/tink