Merge "Add new features to tuner service."