Merge "Import broadcast_ring.h from GVR (reland)" into oc-dev