Squashed commit of the following
commit f419c010 Author: David Meng <xlmeng@amaz on.com> Date: Tue Sep 27 2022 11:34:42 GMT-0400 (Eastern Daylight Time)
Upgrade Gson
commit f419c010 Author: David Meng <xlmeng@amaz on.com> Date: Tue Sep 27 2022 11:34:42 GMT-0400 (Eastern Daylight Time)
Upgrade Gson