Merge "Add flag_declarations for new Baklava modules" into main