1931773 - resolve class resolution issue with aws class in marty diags
1931773 - resolve class resolution issue with aws class in marty diags

arman000/marty,arman000/marty,arman000/marty,arman000/marty