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

Change-Id: I7b8cd2e277dc700690054c327d84cd163a635f97