address review comment for part 22 Azure DONTBUILD