Merge "Fix regression in startBugreport flow" am: 2db5865065 am: fb2ddfd97e
am: 49039cacdc

Change-Id: I582d36545012b7ccc929fcdebe3fbf020bf68081