[automerger skipped] Merge "Fix bugreport warning dialog" am: 591e1fcfcf am: 23f81e572e am: 5e1bcda3b5 -s ours
am skip reason: Change-Id Ib8c16d068c00632d009033c2eab7d2d6cb7e4eea with SHA-1 f90de9746b is in history

Change-Id: I4828ef80632609b8593be7f08895e2f83e9ced76