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

Change-Id: I3f81fc92a531aa9931589c6642701fc1e90c0902