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

Change-Id: I2b45a05f7ec32c0965baac7da3c2b904117db120