Signed-off-by: Henry Wang <henwang@amazon.com> (cherry picked from commit a083b669c9412eef55ee103fe2bb1dec7c6178bc)