Merge "[PARTIAL] Migrate Tuner JNI to use Client interfaces"