(cherry picked from commit 56f73660e15246ec588d7d685725e4adda0f65f1)

Signed-off-by: ps48 <pshenoy36@gmail.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>