Merge "Handle cancelBugreport" into rvc-dev am: 5f8d233835

Change-Id: I316daf6da2c1847bbfb858106a0b0e6df2d61530