fix aws for usage primitives instead of wrappers (#1298)
fix annotation for option to Nonnull (#1298)