Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
am: 7cb47bdd6c

Change-Id: If53493888448b8a9db95a60036f3fb5c5e05ee73