Merge "Fix some Tuner JNI/Client issues found with CTS" into sc-dev