Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 7cb47bdd6c am: 75875b647a am: 06d807dada am: b6244dfccb
am: 44f3c1ada5

Change-Id: I98a256c13b3b310749faf858b3004489eee4ad61