Android O MR1 IOT Release 1.0.2 (4862549)
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"