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

Change-Id: Ie923276a3fb1b6a7e86a169a7c31d19e13628ed2