Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev am: 45fb339d83
am: e3aeae68f3

Change-Id: I999d1d1bf72e7ab02c5d17f37aad00bc711d3fc5