Merge "Fix CUDA being quiet and mark all CUDA_* as advanced" into release-4-6