Forward port of issue #30330 to 2.7.x.

Comment From: wilkinsona

Reopening to remind us to update the Kotlin sample code as well.