Android N IOT Release 2 (NIT1.180611.010.B1)
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"