Merge "Explicitly specify thermal throttling type" into udc-dev