Merge "Add trunk stable flags for Association tag" into main