Switch from add_lunch_combo to COMMON_LUNCH_CHOICES. am: 92b40d2ff9 am: 8654aa7294

Change-Id: If60266082889476c5f0d83150a45c6def6a03fe2