Merge "Merge "Revert "Make broadcast protected"" into rvc-d1-dev am: 243cd3ec1a am: 20d70277c5 am: 2a888d3361"