Kotlin 1.5.31 compatibility

Fixes: 204108213
Test: make
Change-Id: If73c50d9b51cf73c271bf38d7c4fce09d23ae51d
2 files changed