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

Change-Id: Ica2b14c6372e12873290d3c3fc244bb0f03c305d