Merge "Fix TODO in tuner.java" into rvc-dev