Merge "fix Event type 'cpu-cycles' is not supported on the device bug."