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