Merge "Fix bugreport logs by setting 'extra_options' field"
am: 18469210f6

Change-Id: I3b477777a058f132e1848022cae0059ccc06c3b6