Merge "Tuner Java API: minor changes per API review feedback"