Merge "[DCAEGEN2] Change AAI variable syntax in PRH"