Switch from add_lunch_combo to COMMON_LUNCH_CHOICES am: 47302a0e22
am: f223f6e91c

Change-Id: I93bfe6c774a5b1a583894c833292918b2b97cd53