split out from #5204, prepare kotlin migrate with double quotes, and make the files slighty more similar in the logic. and this pull reuqest really doing the kotlin migrate. changes should be more clearly visible in the github diff view and make review easier.
split out from #5204, prepare kotlin migrate with double quotes, and make the files slighty more similar in the logic. and this pull reuqest really doing the kotlin migrate. changes should be more clearly visible in the github diff view and make review easier.