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