Merge "DO NOT MERGE Disable the migration completion timeouts for the initial release" into udc-dev