Merge "Add description to parameters in policy controller"