Merge "Fix bugreport warning dialog"
am: 591e1fcfcf

Change-Id: Ib801c7e45b63d49b31430c97b15bee942014e682