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