Merge "Address kotlin coding style erros" into main