Merge "Avoid clock carousel index-out-of-bound exception" into udc-qpr-dev