Merge "Update the owner file for recovery" into sc-dev