AWS - Resolve conflicts & AWS Build step

Susie Linrequested to merge
aws-resolve-conflicts into main

Resolved build conflicts from recent commit and adding AWS build step to pipeline

Merge request reports