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

Change-Id: I30a02eabaa4581c5a0bbbb5099fd39f194065b52