Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 47302a0e22 am: f223f6e91c
am: e7cbff5118

Change-Id: I558f3f117d1598c56bf392d1e57c64a3a89c9c22