Merge "Change to update of rate control factors."