Merge "Update KL and KCM usages for new optional outputs"