Merge "Fix regression in startBugreport flow"
am: 2db5865065

Change-Id: Ib1cddf40717e8888c14d7450874f7395af87a484