Switch from add_lunch_combo to COMMON_LUNCH_CHOICES
am: 47302a0e22

Change-Id: I88e8f4ff0cb24cac3891c2243f24fb445aa0aa2c