Merge "Make USE_BUGREPORT_API more widely available."