Signed-off-by: Matt Butcher <matt.butcher@microsoft.com> (cherry picked from commit 5f6269d008)
5f6269d008