Merge "Update clearifaceforuidrange to take the interface" into klp-dev