Merge "Move Tether4Key and Tether4Value to common libs"