Signed-off-by: Matthew Fisher <matt.fisher@microsoft.com> (cherry picked from commit 6eeec4a002)
6eeec4a002