Merge "Allow multiple clock plugins simultaneously" into tm-qpr-dev