Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 2ced84e28c am: 43c68cca08
am: 595ad51d88

Change-Id: Ifc6591766733e759eac59a44bea05ccf271862fb