Merge "Fix kotlin deprecation warnings"