Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
am: 078cbd03b2

Change-Id: Ie360f330b29fd716048f31793e6bd593fc826613