fix msftidy warnings
Land #4379