Merge "Tethering offload stats updates are eventually consistent" am: ff12ba9376
am: bbadcfd315

Change-Id: I3ad83ee73bded3b3987bbc86d776852e6ef20f28