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