Squashed commit of the following
commit e5cb47b2 Author: David Meng xlmeng@amazon.com Date: Mon Sep 26 2022 17:02:59 GMT-0400 (Eastern Daylight Time)
Upgrade Gson
commit e5cb47b2 Author: David Meng xlmeng@amazon.com Date: Mon Sep 26 2022 17:02:59 GMT-0400 (Eastern Daylight Time)
Upgrade Gson