Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev