Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: cdc20aa5e0
am: 6de7eff7c0

Change-Id: Ic6c8a90cfc30fd14dd263610266ba0f9cfb3440d