Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 152ea797fd
am: f2d082c586

Change-Id: I64a51c2aab7e05cfdf9aaa22c17f64ab0632f783