c44f109860
Co-authored-by: Shubham Gupta <gshubham@microsoft.com> (cherry picked from commit e3cd627069c7d35b4638af3f2299a248eeca3923)