Merge "Light alarm activity tracing" into oc-mr1-dev