Merge "Add log for backup and recovery setup time" into udc-mainline-prod