Sync azure dev branch to fix-vm-image

This PR is to align fix-vm-image branch with the current azure dev branch.