Merge "Add Automotive specific Flag structure" into main