Merge "Fix tuner API review comments."