Merge "Restrict alarm broadcast" into oc-mr1-dev