Merge "new reset carrier signals/actions" into oc-dev