Merge "Fix frozen alarm issue" into oc-dev