Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev