Merge "Fix bugreport warning dialog" am: 591e1fcfcf am: 23f81e572e

Change-Id: I61001e465ecd26815ff0278d0b4cb7d137fb0e12