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

Change-Id: Iaeeecf55fd66658f89b0abfd54e0b53869c1801c