Merge "Tethering offload stats updates are eventually consistent" am: ff12ba9376 am: bbadcfd315
am: 3d2bf1a5e7  -s ours

Change-Id: Ie4353e3dcd3d9be4e8ff0d8f4e6daf96362eadc6