Merge "Revert "Import broadcast_ring.h from GVR"" into oc-dev