Merge "Avoid likely deadlock in the calltree under alarm manager" into udc-dev