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