Merge "Move TetherStatsKey and TetherStatsValue to common libs"