Fix kotlin deprecation warnings

Test: Presubmit
Change-Id: I3f64f72934e9cdc817a04ad14771478fe5be9664
2 files changed