Applied Jais comments after code review part 2  \r\n Ticket: GCP-8677  \r\n Reviewer: To be reviewed by Jai