Merge "cameraserver: Set abort message for watchdog" into udc-dev