Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 7cb47bdd6c
am: 75875b647a

Change-Id: I2925b68b57d8c8fdcf0d831ea9b1c0989667bad7