Android O IOT Preview 8 (4718959)
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"