Merge "cma: Remove potential deadlock situation"