Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"