Fix lint and type errors relating to data model change#358

JakeTrevor merged 4 commits intojacobtrevor234/amp-231-update-data-modelamps-kt/spa:jacobtrevor234/amp-231-update-data-modelfrom

jacobtrevor234/amp-231-update-data-model-fixamps-kt/spa:jacobtrevor234/amp-231-update-data-model-fixCopy head branch name to clipboard