Android O MR1 IOT Release 1.0.7 (5157592)
Merge "Fix bugreport logs by setting 'extra_options' field"