Switch from add_lunch_combo to COMMON_LUNCH_CHOICES
am: 2ced84e28c

Change-Id: I4800adfa20c39cbcba12791eddbf3b64626afa83