Merge "Restrict alarm broadcast" into rvc-dev