Cherry picked changes on azure_dag file from master branch
Based on Naresh's comment about the reason behind failing pipeline stages on azure dags, we need to cherry pick this file from MR#897 in order to fix the pipeline issue
Based on Naresh's comment about the reason behind failing pipeline stages on azure dags, we need to cherry pick this file from MR#897 in order to fix the pipeline issue