Merge "Add custom header configuration for aai calls"