Address CRs

Previous PR:
https://github.com/AzureRT/azure-sdk-tools/pull/75