Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 078cbd03b2 am: 8dcbe38434
am: c65b46a1a0

Change-Id: I507a0317535a8870c67a8c8d4dcc67aff812314f