Merge "[Dev option] Correction to incorrect flag reference in ag/28429166" into main