Handle the race condition when calling uncrypt services.
am: 1eabf53437

Change-Id: Ia5ac4f91618c1cf4aee67d069542676cf0a5e787