Merge "Include sdk versioning proto in tethering apex"