Apply code review
Merge branch '957' of https://github.com/ogail/azure-sdk-tools into 957