Signed-off-by: Sandeep Bansal <sabansal@microsoft.com> (cherry picked from commit b8e8dcd6e031d005a2d46d95f84da35b436cd870)